From: Peter Michael Green Date: Thu, 28 Apr 2016 13:30:55 +0000 (+0000) Subject: extract packaging changes from 4.4.6-1+rpi6 (d427241c43960e45bcea851351a1ba2f38e61af6) X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~20 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22Program/%22http:/www.example.com/cgi/%22https:/%22Program?a=commitdiff_plain;h=00900c8e98a2f7ac35d1234e93492cdfcaa8ee01;p=linux-4.9.git extract packaging changes from 4.4.6-1+rpi6 (d427241c43960e45bcea851351a1ba2f38e61af6) --- diff --git a/debian/changelog b/debian/changelog index 4e59eca68868..c8831b2a958d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +linux-4.4 (4.4.6-1+rpi6) jessie-staging; urgency=medium + + * Unshelve some more config settings. + + -- Peter Michael Green Thu, 28 Apr 2016 13:30:55 +0000 + linux-4.4 (4.4.6-1+rpi5) jessie-staging; urgency=medium * Unshelve some more config settings. diff --git a/debian/config/armhf/config.shelved b/debian/config/armhf/config.shelved index f4a1226c3952..7305c2883b20 100644 --- a/debian/config/armhf/config.shelved +++ b/debian/config/armhf/config.shelved @@ -1,103 +1,3 @@ -# CONFIG_SCSI_SAS_LIBSAS is not set -# CONFIG_SCSI_UFSHCD is not set -# CONFIG_SCSI_DH is not set -# CONFIG_SCSI_OSD_INITIATOR is not set -# CONFIG_ATA is not set -# CONFIG_MD_MULTIPATH is not set -# CONFIG_MD_FAULTY is not set -# CONFIG_BCACHE is not set -# CONFIG_DM_CACHE is not set -# CONFIG_DM_ERA is not set -# CONFIG_DM_MULTIPATH is not set -# CONFIG_DM_UEVENT is not set -# CONFIG_DM_FLAKEY is not set -# CONFIG_DM_VERITY is not set -# CONFIG_DM_SWITCH is not set -# CONFIG_DM_LOG_WRITES is not set -# CONFIG_TARGET_CORE is not set -# CONFIG_EQUALIZER is not set -# CONFIG_NET_TEAM is not set -# CONFIG_MACVTAP is not set -# CONFIG_IPVLAN is not set -# CONFIG_VXLAN is not set -# CONFIG_GENEVE is not set -# CONFIG_NETCONSOLE_DYNAMIC is not set -# CONFIG_NLMON is not set -# CONFIG_ATM_DUMMY is not set -# CONFIG_ARC_EMAC is not set -# CONFIG_VIA_VELOCITY is not set -# CONFIG_AQUANTIA_PHY is not set -# CONFIG_AT803X_PHY is not set -# CONFIG_AMD_PHY is not set -# CONFIG_MARVELL_PHY is not set -# CONFIG_DAVICOM_PHY is not set -# CONFIG_QSEMI_PHY is not set -# CONFIG_LXT_PHY is not set -# CONFIG_CICADA_PHY is not set -# CONFIG_VITESSE_PHY is not set -# CONFIG_TERANETICS_PHY is not set -# CONFIG_SMSC_PHY is not set -# CONFIG_BROADCOM_PHY is not set -# CONFIG_BCM87XX_PHY is not set -# CONFIG_ICPLUS_PHY is not set -# CONFIG_REALTEK_PHY is not set -# CONFIG_NATIONAL_PHY is not set -# CONFIG_STE10XP is not set -# CONFIG_LSI_ET1011C_PHY is not set -# CONFIG_MICREL_PHY is not set -# CONFIG_DP83848_PHY is not set -# CONFIG_DP83867_PHY is not set -# CONFIG_MICROCHIP_PHY is not set -# CONFIG_MDIO_GPIO is not set -# CONFIG_PPTP is not set -# CONFIG_SLIP_MODE_SLIP6 is not set -# CONFIG_USB_LAN78XX is not set -# CONFIG_USB_NET_CH9200 is not set -# CONFIG_ATH6KL_SDIO is not set -# CONFIG_ATH10K is not set -# CONFIG_B43_SDIO is not set -# CONFIG_B43_PHY_N is not set -# CONFIG_BRCMSMAC is not set -# CONFIG_HOSTAP_FIRMWARE is not set -# CONFIG_LIBERTAS_MESH is not set -# CONFIG_MWIFIEX_USB is not set -# CONFIG_RSI_91X is not set -# CONFIG_INPUT_SPARSEKMAP is not set -# CONFIG_INPUT_MATRIXKMAP is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_KEYBOARD_ADP5588 is not set -# CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_KEYBOARD_QT2160 is not set -# CONFIG_KEYBOARD_LM8323 is not set -# CONFIG_KEYBOARD_MAX7359 is not set -# CONFIG_KEYBOARD_OPENCORES is not set -# CONFIG_KEYBOARD_STOWAWAY is not set -# CONFIG_KEYBOARD_STMPE is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_JOYSTICK_ANALOG is not set -# CONFIG_JOYSTICK_A3D is not set -# CONFIG_JOYSTICK_ADI is not set -# CONFIG_JOYSTICK_COBRA is not set -# CONFIG_JOYSTICK_GF2K is not set -# CONFIG_JOYSTICK_GRIP is not set -# CONFIG_JOYSTICK_GRIP_MP is not set -# CONFIG_JOYSTICK_GUILLEMOT is not set -# CONFIG_JOYSTICK_INTERACT is not set -# CONFIG_JOYSTICK_SIDEWINDER is not set -# CONFIG_JOYSTICK_TMDC is not set -# CONFIG_JOYSTICK_IFORCE_232 is not set -# CONFIG_JOYSTICK_WARRIOR is not set -# CONFIG_JOYSTICK_MAGELLAN is not set -# CONFIG_JOYSTICK_SPACEORB is not set -# CONFIG_JOYSTICK_SPACEBALL is not set -# CONFIG_JOYSTICK_STINGER is not set -# CONFIG_JOYSTICK_TWIDJOY is not set -# CONFIG_JOYSTICK_ZHENHUA is not set -# CONFIG_JOYSTICK_AS5011 is not set -# CONFIG_JOYSTICK_JOYDUMP is not set -# CONFIG_JOYSTICK_XPAD_LEDS is not set -# CONFIG_INPUT_TABLET is not set -# CONFIG_TOUCHSCREEN_AD7877 is not set # CONFIG_TOUCHSCREEN_AD7879 is not set # CONFIG_TOUCHSCREEN_AR1021_I2C is not set # CONFIG_TOUCHSCREEN_ATMEL_MXT is not set diff --git a/debian/config/armhf/config.test b/debian/config/armhf/config.test index 8406ed73effa..9f5af60ab65a 100644 --- a/debian/config/armhf/config.test +++ b/debian/config/armhf/config.test @@ -54,7 +54,7 @@ CONFIG_XZ_DEC_IA64=y CONFIG_XZ_DEC_SPARC=y CONFIG_OID_REGISTRY=y - +# settings unshelved in rpi5 first build # CONFIG_KERNEL_XZ is not set # CONFIG_AUDIT is not set # CONFIG_RCU_STALL_COMMON is not set @@ -154,7 +154,9 @@ CONFIG_OID_REGISTRY=y # CONFIG_BATMAN_ADV_MCAST is not set # CONFIG_NETLINK_MMAP is not set -# settings unshelved in +rpi6# CONFIG_NETLINK_DIAG is not set +# settings unshelved in +rpi5 second build + +# CONFIG_NETLINK_DIAG is not set # CONFIG_MPLS_ROUTING is not set # CONFIG_NET_L3_MASTER_DEV is not set # CONFIG_CGROUP_NET_PRIO is not set @@ -254,3 +256,105 @@ CONFIG_OID_REGISTRY=y # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set # CONFIG_SCSI_SAS_ATTRS is not set + +# settings unshelved in +rpi6 +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_UFSHCD is not set +# CONFIG_SCSI_DH is not set +# CONFIG_SCSI_OSD_INITIATOR is not set +# CONFIG_ATA is not set +# CONFIG_MD_MULTIPATH is not set +# CONFIG_MD_FAULTY is not set +# CONFIG_BCACHE is not set +# CONFIG_DM_CACHE is not set +# CONFIG_DM_ERA is not set +# CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_UEVENT is not set +# CONFIG_DM_FLAKEY is not set +# CONFIG_DM_VERITY is not set +# CONFIG_DM_SWITCH is not set +# CONFIG_DM_LOG_WRITES is not set +# CONFIG_TARGET_CORE is not set +# CONFIG_EQUALIZER is not set +# CONFIG_NET_TEAM is not set +# CONFIG_MACVTAP is not set +# CONFIG_IPVLAN is not set +# CONFIG_VXLAN is not set +# CONFIG_GENEVE is not set +# CONFIG_NETCONSOLE_DYNAMIC is not set +# CONFIG_NLMON is not set +# CONFIG_ATM_DUMMY is not set +# CONFIG_ARC_EMAC is not set +# CONFIG_VIA_VELOCITY is not set +# CONFIG_AQUANTIA_PHY is not set +# CONFIG_AT803X_PHY is not set +# CONFIG_AMD_PHY is not set +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_TERANETICS_PHY is not set +# CONFIG_SMSC_PHY is not set +# CONFIG_BROADCOM_PHY is not set +# CONFIG_BCM87XX_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_MICREL_PHY is not set +# CONFIG_DP83848_PHY is not set +# CONFIG_DP83867_PHY is not set +# CONFIG_MICROCHIP_PHY is not set +# CONFIG_MDIO_GPIO is not set +# CONFIG_PPTP is not set +# CONFIG_SLIP_MODE_SLIP6 is not set +# CONFIG_USB_LAN78XX is not set +# CONFIG_USB_NET_CH9200 is not set +# CONFIG_ATH6KL_SDIO is not set +# CONFIG_ATH10K is not set +# CONFIG_B43_SDIO is not set +# CONFIG_B43_PHY_N is not set +# CONFIG_BRCMSMAC is not set +# CONFIG_HOSTAP_FIRMWARE is not set +# CONFIG_LIBERTAS_MESH is not set +# CONFIG_MWIFIEX_USB is not set +# CONFIG_RSI_91X is not set +# CONFIG_INPUT_SPARSEKMAP is not set +# CONFIG_INPUT_MATRIXKMAP is not set +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +# CONFIG_KEYBOARD_ADP5588 is not set +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_QT2160 is not set +# CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_MAX7359 is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_STMPE is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_JOYSTICK_ANALOG is not set +# CONFIG_JOYSTICK_A3D is not set +# CONFIG_JOYSTICK_ADI is not set +# CONFIG_JOYSTICK_COBRA is not set +# CONFIG_JOYSTICK_GF2K is not set +# CONFIG_JOYSTICK_GRIP is not set +# CONFIG_JOYSTICK_GRIP_MP is not set +# CONFIG_JOYSTICK_GUILLEMOT is not set +# CONFIG_JOYSTICK_INTERACT is not set +# CONFIG_JOYSTICK_SIDEWINDER is not set +# CONFIG_JOYSTICK_TMDC is not set +# CONFIG_JOYSTICK_IFORCE_232 is not set +# CONFIG_JOYSTICK_WARRIOR is not set +# CONFIG_JOYSTICK_MAGELLAN is not set +# CONFIG_JOYSTICK_SPACEORB is not set +# CONFIG_JOYSTICK_SPACEBALL is not set +# CONFIG_JOYSTICK_STINGER is not set +# CONFIG_JOYSTICK_TWIDJOY is not set +# CONFIG_JOYSTICK_ZHENHUA is not set +# CONFIG_JOYSTICK_AS5011 is not set +# CONFIG_JOYSTICK_JOYDUMP is not set +# CONFIG_JOYSTICK_XPAD_LEDS is not set +# CONFIG_INPUT_TABLET is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set